fix helm manifests to support 2.16 jaeger configs#841
Conversation
michaellzc
left a comment
michaellzc
left a comment
There was a problem hiding this comment.
can we update the CHANGELOG to indicate this is a breaking change?
also might want to do a changelog post in sg/sg as well
|
also CI is complaining about outdated dodcs |
@michaellzc did you mean the changelog in this repo, or the changelog product on main? The changelog in here isn't really that robust in its release tracking |
I was thinking both, but you're right. let's just do |
Chickensoupwithrice
left a comment
Chickensoupwithrice
left a comment
There was a problem hiding this comment.
other than marking as breaking change, this seems good
|
The backport to To backport this PR manually, you can either: Via the sg toolUse the sg backport -r 7.1.x -p 841Via your terminalTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.1.x 7.1.x
# Navigate to the new working tree
cd .worktrees/backport-7.1.x
# Create a new branch
git switch --create backport-841-to-7.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1b6f92b83fe858207be75b261b1c80754482227e
# Push it to GitHub
git push --set-upstream origin backport-841-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.xIf you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-841-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.x
Once the pull request has been created, please ensure the following:
|
Updates to the jaeger instructions for self hosted customers on helm Associated to sourcegraph/deploy-sourcegraph-helm#841
) Backport 1b6f92b from #841 closes PLAT-485 Update manifests to support 2.16 jaeger configurations style This follows changes to the sourcegraph jaeger base image sourcegraph/sourcegraph#10912 ### Test plan See testing from original PR, this version of the charts was tested via `kind` Tested by generating a template of the jaeger deployment and running ``` helm unittest charts/sourcegraph -f 'tests/otelCollectorJaeger_test.yaml' -f 'tests/otelAgentHostPort_test.yaml' 2>&1 ``` Co-authored-by: Warren Gifford <warrenbruceg@gmail.com> Co-authored-by: Michael Lin <mlzc@hey.com>
4 participants
closes PLAT-485
Update manifests to support 2.16 jaeger configurations style
This follows changes to the sourcegraph jaeger base image https://github.com/sourcegraph/sourcegraph/pull/10912
Test plan
See testing from original PR, this version of the charts was tested via
kindTested by generating a template of the jaeger deployment and running